Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 26 Jul 2010 01:23:49 +0000 (01:23 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 26 Jul 2010 01:23:49 +0000 (01:23 +0000)

Trivial merge